Merge "Keyguard remote control display artwork size" into jb-mr2-dev