Merge "Only doze when not occluded" into mnc-dev