Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev