Merge "Check if the activity translucency was converted before converted back. am: 39dd370d am: fe9e68a6" into nyc-mr2-dev-plus-aosp