Merge "Add focus indicator only when attaching physicalkeyboard" into devel/master