Merge "Lock orientation for CapturedActivity" into nyc-mr1-dev