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