Merge "Make the lock screen camera widget configurable (2/2)" into cm-11.0