Merge "Fix the ActivityView consuming shade touches." into rvc-dev