Merge additions to common from Sailfish UI