Merge "Added Backup & Restore for SystemUI and controls" into rvc-dev