Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo