Merge "Update media controller appearance." into honeycomb-mr1