Merge "Fix KeyboardFocus indicator alignment" into devel/master