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

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