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