Merge "Fix external status bar icon sizes"