Merge "Removing lock screen app widget code" into lmp-dev