Merge "Prevent drawing on top of Bluetooth activities" into rvc-qpr-dev