Merge "Failing with diags when UiObject2 container disappears" into ub-launcher3-rvc-dev am: 2c75d08806

Change-Id: Ie6d9e6b7555dd3bc021b11b25f3d79409161baa8