Merge "Avoid gestures occuring on AOD2." into sc-dev