Merge "Adding flag for optimizing apps indexer" into main