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