am f6b6462f: am 14adfe42: Address comments from merged "Fix remaining jank in sec..."

* commit 'f6b6462f277689b7bb6b1f66cb5b57f30d1e194c':
  Address comments from merged "Fix remaining jank in sec..."