Merge "Fix lock settings pattern crash on configuration change" into cm-10.1

Change-Id: I675ecb39ad83304523c7d0c9b1aa0876e256e501