Merge "Fix lockpattern weirdness" into mnc-dev