Merge "Fix blank activity after promoting overflow bubble" into rvc-dev