Service Attempt Entry screen sanity check-in.
Merge remote-tracking branch 'origin/master' into MultipleServiceAttemptEntry
Merge branch 'MultipleServiceAttemptEntry'
Revert 54bb7ec..88b59a6

This rolls back to commit 54bb7ec7d5e610f9926c6e164e7bbd0d516e614f.
Quy update of Service Attempt Entry tab navigation screen.