Merge "Fix pattern lock for accessibility" into mnc-dev