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

Change-Id: Ia0e85dec4901c220671c6a5b1407307219eafccd