Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0