Merge "Ok Droid, enable inline reply"