Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom