Merge "Fix 5224359: Add width and height to media store."