Merge "power: smblib: extend wait time after force sink in try.SNK"