Merge "Show selection handles even when toolbar is empty."