Merge "Make Activites touch opaque - DO NOT MERGE" into rvc-dev