Merge "Add lifecycle methods for managing the options menu."