Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev