Merge "Revert "Add OutputPageScriptsForBottomQueue hook""