Merge "Code cleanup related to initSpeculativePageId()"