Merge "Refactor space bitmap to support different alignments."