Merge "Choose opaque activity for fixed rotation with entering pip" into sc-v2-dev