Merge "Action bar API updates - new display options"