Merge "Include a developer option sliding flag to toggle the different amount of apps to show" into main