Merge "Start with mHiddenForOtherReasons=true" into nyc-dev