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

Change-Id: I1331dadb63009eb7acf693b59f16aebe1557d51e