Merge "Lock the orientation for FallbackHome" into nyc-mr1-dev