Merge "Add SysUI rest_to_unlock flag" into main