Merge "Don't send lock icon touches to NotifShade" into sc-v2-dev