Merge "Add setting to disable keyguard widgets" into klp-dev