Merge "Add game mode to TimeStats - System Server changes" into sc-dev