DA-84: Finished enabling the notes spinner.
DA-84: Resolved merge conflicts.