am f7fd4ca8: Merge "Disable change PIN when PIN is inactive"

* commit 'f7fd4ca832e8ee28f0217d8096c3b401309a1f0f':
  Disable change PIN when PIN is inactive