Merge pull request #17949 from wilsonpage/bug/991506

Bug 991506 - flash and swap buttons respond to touches even when hidden