Merge "Fix availability status for AOD gestures" into pi-dev