Merge "Revert "Handle activity result for 3D effect."" into tm-qpr-dev