Merge "Handle restore on ACCESSIBILITY_QS_TARGETS setting" into main