Merge "Fix janky on permission bar chart"