Merge "Minor clean up in ActivityThread, mostly final usage"