Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev