Fixing compilation issue (missing return value).

Change-Id: If5adf7961759e30371ff732ad1e0fad98e4f9033
Merge topic 'refactor_panels' into next

683dd5f Fixing compilation issue (missing return value).