Merge "Merge "Add LightRevealScrim to dumpsys to rule it out as the cause of an elusive bug." into sc-dev am: 1afbd3c9 am: 4558f523"