Merge "Fix switch bar theme, clean up text appearances"