Merge "Update app usage page active time column" into sc-dev