Merge "Fixing issue where flinging the Customize tray would scroll to the incorrect page after update."