Merge "Fix "Screen on" time reporting" into sc-dev