Merge "Hide translucent activity conversion API" into klp-dev