Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev am: 95c1cbeb50 am: 023ea2a3ae
am: 2de5ae58d8

Change-Id: I327842267a1674ac6e67a6ae9d462854879fb542