Merge "Migrate screenshot methods to AIDL"