Ensure new topic pages are occupied

Change-Id: I06a68bfe55a57abeab8f5c62558adc3213062ca0
Merge "Ensure new topic pages are occupied"