Merge "PhoneWindowTest: promote to presubmit" into pi-dev