Merge changes from topic "Fix WindowFocusTests Flaky-rvc-dev" into rvc-dev am: dcea9181 am: 59a8a019 Change-Id: I75832f23b69f7a6579047ad640926df7358fd94e