Merge "Fix WPS dialog disappearing after rotate screen"