Merge "Merge "Fixed bugs with starting windows when displayng forcedResized activity" into nyc-dev am: b406dd20ee am: 273d6e8f56" into nyc-mr1-dev-plus-aosp