Merge "Disable OPA edge flash animation" into qt-dev am: 54057a1160 am: 0ddc2dc88a
am: 593e7573c2

Change-Id: I07c0a5bc0a9bc9e44b272a6183d5a02470448d2f