Merge "Inserting waiting for settling in the Workspace state after "back" from All Apps" into main