Merge "Fix cts flakiness AppStart and OverlayState" into pi-dev