Merge "Fix: Two UI update issues in change screen."