Merge "Repostion contextual buttons upon layout changes" into main