Merge "Polling on hasFocus() for requestFocus() success" into pie-cts-dev
am: aa269e4704

Change-Id: Ia6c6b9bf6f6d41fef6b82c25143881029b7986b5