Merge "Using startActivityForResult to open DWB properties" into ub-launcher3-master