Merge "Fix Notification panel flickers comes from ag/4008279" into pi-dev am: 035e25bf90
am: b851a78707

Change-Id: I5b4f4fad4b324e6283f46c260e58bbc23bd24b46