Merge "Override SCREEN_ORIENTATION_LOCKED to portrait" into udc-qpr-dev