Merge "Adding APIs for setting whether to show week number and setting the start day of week. Cleaned up the code a bit."