Merge "Remove freezeDisplay(), which is no-op."