Merge "New UX for app usage screen"