Merge "Fix bug with flickering actions bar" into main