Merge "Fix NPE on dozeTimeTIck" into sc-dev