Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev