Merge \"Prevent a11y seeing behind tasks w/modal windows.\" into nyc-mr1-dev
am: a200e774e7

Change-Id: I3a7c35a3271b1480d890eeb0edfbabc96302cfc0