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

Change-Id: I290cf138b577deb8d2f70ca22a4107be4abb186a