Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev