Merge "Revert "Boot time resolution changes in framework""