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

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