Merge "Controls - Fix bouncing dialog"