Merge "SF: pass the predicted present time to LayerHistory" into sc-dev