Merge "Fix getBuiltInWallpaper method" into klp-dev