Merge "Fix Notification panel flickers comes from ag/4008279" into pi-dev