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