[imp] Code style fixes for view controllers. Fixes #3669