Merge "Changes to render the action bar correctly in ADT." into idea133