Merge "Disable OPA edge flash animation" into qt-dev