Merge "Migrate screenshot methods to AIDL" into tm-dev