Merge "Fix the ActivityView consuming shade touches." into rvc-dev am: 377e486c34 am: 7ae8282f2d am: 79a22eb375

Change-Id: I9deeb9669d7cbdf4b7f982d5c361e7e7056e686b