Merge "Fix depth jumping around during transitions." into ub-launcher3-rvc-dev am: 02f0f82883

Change-Id: I91f98b4e689999046356346af7d414d43c139c2f