Implemented workaround for #1699 that keeps the expanded accordion area in view.
Resolved merge conflict.