Merge "Boot time resolution changes in framework"