Quickfix for incorrect return type is blocked by conditional expression

- Add check if expression is part of return statement
- Add test case

Change-Id: Iabbb0b7b33a589243d47e9f91dacbb9bd984835b