Merge "Suspend dialog improvememts" into sc-dev