Merge "Check if the activity translucency was converted before converted...
Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e am: 4ebbea26
am: 69eac282
Change-Id: I657afb71f525f8d46d3c95f15c908cd070fda636