Merge "Force Now Playing to re-layout after lock icon moves when folding" into main