Merge "Add WM Flicker Tests for App Compat" into udc-dev