Merge "Preventing activity to restart when keyboard is connected or keyboard type changes" into ub-launcher3-burnaby-polish