Merge "Protect against assumptions of a top focused stack." into rvc-dev am:...
Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e5 am: 1e291808 am: 767341c7 am: 8700e35d
Change-Id: Ic270f0fe1632fa2b4055f22cec391cbf81bb7751