Merge "Hide Camera background running time in the battery usage screen" into sc-dev