Merge "Adjust preferene to align the lastest mock"