Merge "Fix toggle widget can be switched under overlapped view am: 4794b798c4 am: cfffebd5c4 am: a4afb4742a" into rvc-qpr-dev-plus-aosp