Merge "Fixed a bug with talkback where the panel could be expanded" into nyc-dev