Merge "Remove popup indicator for dialog style preference items." into honeycomb