Squish: Fix trailing whitespace

Additionally pushing Cancel instead of OK when
leaving Options dialog (we don't change anything).

Change-Id: I67ff5a891dc3a038822ff42e798981f00d633e80
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>