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

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