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

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