Merge "Revert "Cleanup code related to ag/11035582"" into ub-launcher3-rvc-dev