Merge "Clean up app usage page" into sc-dev