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

Change-Id: I6b9e71c36a38c49c9894aa2ac028fa4c58a20de0