Blender Git Loki

Fix T79524: Button alignment broken in some cases

ad4928a1710f disabled alignment for too many cases. Still try to avoid
aligning many items, to avoid thousands of redundant alignment
calculations. But now we're much more picky adding an sub-row with
alignment.