Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e01 am: a95e7a2be7
am: 88d9a67538

Change-Id: I7192cf19bf041d940274e11cd48e87d6f684b169