Merge "Migrate display related methods to AIDL"