Merge "Migrate display related methods to AIDL part 3"