Merge "Lockscreen options : Camera/widgets toggle" into cm-10.1

Change-Id: I919c4c8ba55f2da1a5ceec45d5fa9454fdf3563b