Merge "Check for NULL return value in button-impl.cpp" into devel/master