Merge "Improvements to the system bar:"