Merge "Move existing FlickerTests under subdirectory" into udc-qpr-dev