Settings : Fix CustomScreenColor when picking an image

Change-Id: I510b562eb0e9fb9b558380db5c5d6e818ba17d12
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Settings: Modify & add AOSP JA translation

Change-Id: Ic5ef0aed93cca89b37a91b95fa8debee66fc34a1
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-11.0