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

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