Merge remote-tracking branch 'pa_upstream/kitkat' into legacy
Move protected apps strings to cm_strings

Change-Id: I7099ac4a817fa3db8d418b329b9a3344aea1da69
Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Merge remote-tracking branch 'legacy/kitkat' into kitkat