Now uses colorPrimary as its background color and sets colorAccent directly. Some other mild cleanup as well. BUG: 28760785 Change-Id: Ib8e5140b789449e518b498bc49438cb4a2bc6451