Merge "Integrating updated system bar assets Bug: 5353986"