Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev