Merge "Merge "Check if the activity translucency was converted before converted back." into cw-f-dev am: 6d7dc11e am: 4ebbea26" into nyc-mr2-dev-plus-aosp