Merge "Respect the absence of FLAG_ROTATES_WITH_CONTENT." into udc-qpr-dev