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

Change-Id: I1ad11517c50cda3b37d3193ace983bb8b1a58c36