Merge "Cleanup code related to ag/11035582" into ub-launcher3-rvc-dev am: 11e36db88a

Change-Id: I52eb69f1bc54d9896e0470e54e0de541e5731475