Merge "Remove unnecessary waitForIdle calls" into ub-launcher3-rvc-dev am: 7bb915ba8e

Change-Id: Id1b81e004cf0dde365e51f3fd4fbb5859035499a