Merge "ChangeScreen2: Fix bouncing Files header"