Merge "IMS: Refactor additional display input properties to avoid deadlock" into tm-dev