Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0