Merge "Fix bug 5186341 - Double Action bar when displayOptions is 0"