Merge "Add get_prop(domain, surfaceflinger_prop)"