Merge "Add callbacks for change in supported device states and non-override state." into sc-dev