Merge "Correct AppWidget layout when WP is off" into sc-dev