Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes"