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