Merge "Don't wait on configuration change for square displays." into stage-aosp-pi-cts-dev