Merge "Fix metrics on Holo progress dialogs"