Merge "Make sure Manage button updates for display size changes" into sc-dev