Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev