Nav bar moves independently of the layer

Wait until it's in the correct place to consider the rotation as finished

Relanding ag/26837592 which was reverted because it dodn't work on tablets

Fixes: 332788177
Test: atest FlickerTestsRotation
Change-Id: Ifcf6e8ceb8e1e62054cfbfb22a38f6a703feb077