am c3f91e0c: am b530dc2a: Merge "Check for null layout when add focusables is called" into lmp-mr1-ub-dev

* commit 'c3f91e0ca4146737da04db9ae56c2b492812a8d4':
  Check for null layout when add focusables is called