Merge "Temporary wait to check that waiting after swiping from context menu is a way to the real fix." into sc-dev