Merge "Bug 4972534 - System dialog updates for ICS"