Merge "Disable OPA edge flash animation" into qt-dev
am: 54057a1160

Change-Id: I236638dfb3065909ba6bec00e89eb554825c3885