Merge changes from topic "b224749799" into tm-dev

* changes:
  Allow null prev/next buttons to be INVISIBLE instead of GONE
  Remove logging and nullable return type from getCustomAction