Merge "Run has:draft and is:starred before secondary index"