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

Change-Id: I48f67ac1a8f54529bd4a37770fc1c35dc7cabb6d