Merge "Enable upgrading persistent APKs on boot." into qt-dev