Merge "Always restart apps if base.apk gets updated." into tm-dev