Merge "Use USER_SYSTEM instead of USER_ALL when enabling rollback." into qt-dev
am: 00202de30e

Change-Id: I7d2d103f0280b34793cffbf05fb8edaecfa2b71b