Merge "Check if the activity translucency was converted before converted...
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e am: a95e7a2b
am: 88d9a675
Change-Id: I7192cf19bf041d940274e11cd48e87d6f684b169