Merge "Migrate display related methods to AIDL part 3" into tm-dev