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

Change-Id: I789ba7621b61d7b28a7f2f838cef26241708c856