Merge "Make the lock screen camera widget configurable (1/2)" into cm-11.0
Merge "privacyguard: Share privacy package name between activity stacks" into cm-11.0
Merge "base: Check for homeAsUp status when collapse actionbar widget" into cm-11.0