Merge "Fix bug 3338079 - Dialog styled activity decor" into honeycomb