Merge "lock pattern width spec set to max" into ics-mr1