Merge "Unfocus display tabs on click." into main