Regression: Make editing work again on mobile beta

Change-Id: I42be459c78ea05fad9d24bfabd37f18743f41050