Merge "Holo dialog formatting"