Merge "sdm: Refactor locking in Display* classes"