Merge "Remove popup indicator for dialog style preferences." into honeycomb