Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  rv-edit-screen: ensure pluginRestApi is defined before call

Change-Id: I0100f14d917608fb195cca0c3ebcf9a8ce1feb21